From 1a6445c4c9999ff634241e05630b9f8d0c863a34 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Thu, 8 Jul 2021 03:58:55 +0200 Subject: [PATCH] debian/libgtk-4-doc.*: Adapt install files and links to gi-docgen paths Docs are installed all in /usr/share/docs/libgtk-4-doc subfolders and linked to /usr/share/gtk-doc to keep devhelp support --- debian/libgtk-4-doc.doc-base.gdk-wayland.in | 13 +++++++++++++ debian/libgtk-4-doc.doc-base.gdk-x11.in | 13 +++++++++++++ debian/libgtk-4-doc.install.in | 8 +++++--- debian/libgtk-4-doc.links.in | 16 ++++++++++------ debian/libgtk-4-doc.lintian-overrides | 2 -- debian/rules | 11 ----------- 6 files changed, 41 insertions(+), 22 deletions(-) create mode 100644 debian/libgtk-4-doc.doc-base.gdk-wayland.in create mode 100644 debian/libgtk-4-doc.doc-base.gdk-x11.in delete mode 100644 debian/libgtk-4-doc.lintian-overrides diff --git a/debian/libgtk-4-doc.doc-base.gdk-wayland.in b/debian/libgtk-4-doc.doc-base.gdk-wayland.in new file mode 100644 index 0000000000..6d2090ad54 --- /dev/null +++ b/debian/libgtk-4-doc.doc-base.gdk-wayland.in @@ -0,0 +1,13 @@ +Document: gdk4-wayland +Title: GdkWayland Reference Manual +Author: Damon Chaplin et al. +Abstract: The GDK library provides an OS-independant wrapper around the + most fundamental graphical user interface functions. This allows + GTK to be ported to non-X11 systems, as long as GDK is ported first. + . + This document covers programming in GDK with the wayland backend. +Section: Programming/C + +Format: HTML +Index: /usr/share/doc/@DOC_PKG@/gdk4-wayland/index.html +Files: /usr/share/doc/@DOC_PKG@/gdk4-wayland/*.html diff --git a/debian/libgtk-4-doc.doc-base.gdk-x11.in b/debian/libgtk-4-doc.doc-base.gdk-x11.in new file mode 100644 index 0000000000..28fcc06c6e --- /dev/null +++ b/debian/libgtk-4-doc.doc-base.gdk-x11.in @@ -0,0 +1,13 @@ +Document: gdk4-x11 +Title: GdkX11 Reference Manual +Author: Damon Chaplin et al. +Abstract: The GDK library provides an OS-independant wrapper around the + most fundamental graphical user interface functions. This allows + GTK to be ported to non-X11 systems, as long as GDK is ported first. + . + This document covers programming in GDK with the X11 backend. +Section: Programming/C + +Format: HTML +Index: /usr/share/doc/@DOC_PKG@/gdk4-x11/index.html +Files: /usr/share/doc/@DOC_PKG@/gdk4-x11/*.html diff --git a/debian/libgtk-4-doc.install.in b/debian/libgtk-4-doc.install.in index 26c100daad..1859211574 100644 --- a/debian/libgtk-4-doc.install.in +++ b/debian/libgtk-4-doc.install.in @@ -1,3 +1,5 @@ -usr/share/doc/gtk4* -usr/share/doc/gdk4* -usr/share/doc/gsk4* +usr/share/doc/gdk4 usr/share/doc/@DOC_PKG@ +usr/share/doc/gdk4-wayland usr/share/doc/@DOC_PKG@ +usr/share/doc/gdk4-x11 usr/share/doc/@DOC_PKG@ +usr/share/doc/gsk4 usr/share/doc/@DOC_PKG@ +usr/share/doc/gtk4 usr/share/doc/@DOC_PKG@ diff --git a/debian/libgtk-4-doc.links.in b/debian/libgtk-4-doc.links.in index aac5175be7..5621c97bee 100644 --- a/debian/libgtk-4-doc.links.in +++ b/debian/libgtk-4-doc.links.in @@ -1,9 +1,13 @@ -usr/share/gtk-doc/html/gdk4 usr/share/doc/@DEV_PKG@/gdk4 -usr/share/gtk-doc/html/gdk4 usr/share/doc/@DOC_PKG@/gdk4 -usr/share/gtk-doc/html/gsk4 usr/share/doc/@DEV_PKG@/gsk4 -usr/share/gtk-doc/html/gsk4 usr/share/doc/@DOC_PKG@/gsk4 -usr/share/gtk-doc/html/gtk4 usr/share/doc/@DEV_PKG@/gtk4 -usr/share/gtk-doc/html/gtk4 usr/share/doc/@DOC_PKG@/gtk4 +usr/share/doc/@DOC_PKG@/gdk4 usr/share/doc/@DEV_PKG@/gdk4 +usr/share/doc/@DOC_PKG@/gdk4 usr/share/gtk-doc/html/gdk4 +usr/share/doc/@DOC_PKG@/gdk4-wayland usr/share/doc/@DEV_PKG@/gdk4-wayland +usr/share/doc/@DOC_PKG@/gdk4-wayland usr/share/gtk-doc/html/gdk4-wayland +usr/share/doc/@DOC_PKG@/gdk4-x11 usr/share/doc/@DEV_PKG@/gdk4-x11 +usr/share/doc/@DOC_PKG@/gdk4-x11 usr/share/gtk-doc/html/gdk4-x11 +usr/share/doc/@DOC_PKG@/gsk4 usr/share/doc/@DEV_PKG@/gsk4 +usr/share/doc/@DOC_PKG@/gsk4 usr/share/gtk-doc/html/gsk4 +usr/share/doc/@DOC_PKG@/gtk4 usr/share/doc/@DEV_PKG@/gtk4 +usr/share/doc/@DOC_PKG@/gtk4 usr/share/gtk-doc/html/gtk4 usr/share/doc/libglib2.0-doc/glib usr/share/doc/@DEV_PKG@/glib usr/share/doc/libglib2.0-doc/glib usr/share/doc/@DOC_PKG@/glib usr/share/doc/libglib2.0-doc/gobject usr/share/doc/@DEV_PKG@/gobject diff --git a/debian/libgtk-4-doc.lintian-overrides b/debian/libgtk-4-doc.lintian-overrides deleted file mode 100644 index 29ee2a0e91..0000000000 --- a/debian/libgtk-4-doc.lintian-overrides +++ /dev/null @@ -1,2 +0,0 @@ -# https://bugs.debian.org/970275 -libgtk-4-doc: package-contains-documentation-outside-usr-share-doc usr/share/gtk-doc/html/* diff --git a/debian/rules b/debian/rules index a43364f821..a6e07311a7 100755 --- a/debian/rules +++ b/debian/rules @@ -258,17 +258,6 @@ ifneq ($(filter %-udeb,$(built_binaries)),) endif override_dh_install: - rm -frv debian/install/deb/etc/emacs/site-start.d/*gtk-doc-tools.el - rm -frv debian/install/deb/usr/bin/gtkdoc* - rm -frv debian/install/deb/usr/share/aclocal/gtk-doc.m4 - rm -frv debian/install/deb/usr/share/cmake/GtkDoc - rm -frv debian/install/deb/usr/share/emacs/site-lisp/gtk-doc-tools - rm -frv debian/install/deb/usr/share/gtk-doc/data - rm -frv debian/install/deb/usr/share/gtk-doc/python - rm -frv debian/install/deb/usr/share/man/man1/gtkdoc* - rm -frv debian/install/deb/usr/share/pkgconfig/gtk-doc.pc - rm -frv debian/install/deb/usr/share/sgml/gtk-doc - : rm -fv debian/install/udeb/usr/bin/gtk4-update-icon-cache rm -frv debian/install/udeb/usr/share/gtk-4.0/valgrind rm -frv debian/install/udeb/usr/share/metainfo -- 2.30.2